]> git.neil.brown.name Git - wiggle.git/commit
csl_join should merge adjacent matches.
authorNeilBrown <neilb@suse.de>
Fri, 22 Mar 2013 04:04:48 +0000 (15:04 +1100)
committerNeilBrown <neilb@suse.de>
Fri, 22 Mar 2013 04:04:48 +0000 (15:04 +1100)
commitfaa36dd65bfccde8f61debeaa9a691b5185f5777
tree961db85f09635f0d864663f38e7977b657561940
parent31bf38698cb4e0cb9246045d7fc33f32b2e1986c
csl_join should merge adjacent matches.

When diffing against a patch we treat each hunk separately
and join the result.
This joining doesn't merge adjacent matches so it doesn't really
tell the full story of where the matches are and how big
they are.  This can confuse other code, particularly when
examining hunk headers to create the merger.

So add detection for adjacent matches.

Signed-off-by: NeilBrown <neilb@suse.de>
diff.c